Proper users cleanup