Cleanup extra comments