Remove leftover refactoring comments