Remove dead options; move some from global to user config