Removed more unused config options