Remove commented code, no functionality changed