Add selection of default persistence store
Update to default persistence store configuration
Remove commented code.