excise last remaining mentions of requirements/reqs
knock out a few TODOs