Remove unused comment and method
Refactor