cleanup commands

general cleanup and adjust to https://github.com/phpcr/phpcr-utils/pull/74 and https://github.com/doctrine/phpcr-odm/pull/397