Idenditation cleanup