Mostly, removal of old code that had been commented out instead of
removed