Remove services that have been migrated to spring but not removed from config files.

Update a few spring path mappings