Cleanup commented out code 2.