GPII-625: Removed commented out code

Had left some code marked for removal, for testing purposes. These have now been removed.