Clear more ugly comments