Cleaning up after AI rockstar developers

A rabbit hole in 5 commits

Goldilocks and the Three Developers