cleanup: throwing out lots of obsolete features