Can we just delete the commented out code? It's stored in the VCS history so we can always get it back :).