Clean up identity processing