some cleanup before refactoring