Stop using setup when I need not