Remove some deprecated/unnecessary config params