Wip cleanup memory store