Cleanup commented codes