Expand cleanup to encompass all ItemStat's in build restart