2019-11-22 -- Cleanup difficult

Avoid making junk in the first place. ugh.