Improved variable name
Removing clientId/id deps from list when destroying