♻️ Refactor parts of identity removal