Remove incorrect if conditions in setup()