Remove outdated files and tidy up