Make sure we remove params that we override with externals