Some tidy up of old files