More memory cleanup - and more to come