Removed a handful of non-functionality.  These removals are not present in Testing, so I iff'n I get them working there, they'll be back