GWTII-190: Removed commented code.