Cleanup - some of what I removed from the previous commit
was merely commented out rather than actually removed entirely.
Now it's removed completely.