modify to remove unused comments