FIXUP: clean up Makefile.features mess