Remove garbage from previous refactoring