Removed more unused config types