post refactor cleanup