FIxed "INDENTITY" error
Endpoint deletion services happens before service deletion