Modify comments; trim unused code