Added clean-up-files to main. Also removed some unused stuff from utilities.