delete comments and wasteful code