Remove persistence container specific functionality

* Refactor provisioning