[clean] cleanup commented code