cleaned up some user functionality