Removal of refactoring stuff which was only uploaded to exist in the history