Remove unused comments and code