clean up previous work to prepare for refactoring