re-refactor cleanup after tests