Improved input clean up in setUp