remove overhang from previous refactoring