Resolve issues with service deletion

Corrected cascades and relations between entities

Change-Id: I6b2cd2dbc29bbd5a51e30235cd0669d9c29e20d4