Removed more files that should have been removed in first re-org commit