clean up after last refactor