Cleaned up the CRUD for service definitions.