Remove methods that were used for refactoring only