Cleanup commented code