post-refactor cleanup