get rid of work in progress refactoring