Cleanup of the PHPCR config
Refactored configuration