Tidy up files for master