GPII-941: Did some general cleaning up