correct comments and unused code