Cleanup commented out code