Grp10no110 cleanup