WIP: continue snapshot load/store cleanup