RF + TST: Removed some (unused? Definitely untested!) cruft. More test
coverage.