Improve user removal procedure