Fix clean user functionality