Wip cleanup memory store

Maybe should return 1 iff it was present?