more persistency cleanups