Late cleanup after merge

Delete bogus files, restore main file comments and stage size