tidy up some user stuff