Fixed service names
Removed unused configuration