Cleanup  - moving persistence configuration out of api