Previous changes obsolete quite a bit of what I'd already written
Clean up those obsolete pieces