Cleaned up old refactoring comments