Clean up the user model and remove old crypto dependency