Code

Remove if which check - done in tools/setup instead