move revoking outside of user model