refactoring: remove test only methods