finish clean up from previous refactor