tidy up user model, remove extra unused roles