Slimming down the setup