Just clean up before I try out some user/admin functions