Cleaned up Service CRUD.
Cleaned up Services CRUD handling.