OoM code clean up