Remove some comments with unused code