Refactoring: removing new* functions