cleanup engaugeUnit code