rolling back on a few user options

More to come as features are added