Re-removed unused config options