remove use of features missing in mainline