Tidy up some unused code and files.