Clean out some feature files.
Clean up Makefile.