Unused configuration options removed