User functionality cleanup