Add hamcrest-all dependency
Remove unused datasource identifiers
Remove some spring overrides