Tidy up more files