more cruft removal.
more wrangling…