Lots of clean up needed but seems like we have a tight handle on memory
footprint now.