Removing a couple of no longer used config options