SHRINKRES-169 Class imports cleanup