Identity changes cleanup