Remove old files and tidy up