incident grid class cleanup