Remove references to deprecated config options