Cleanup commented out code 1.