Refactor and remove unused comments