fix currentUser passing in model, clean up settings