Clean up some user stuff