GPII-434: Cleaning up some comments