pre refactoring cleanup