Fix user remove procedure