Removing old refactorings covered by refac_all