GEOT-4891, minor clean up on the clip process