clean up before major refactoring