Removing all extra configuration options, as they are full of terror.
More ripping out of unneeded things.