some more tooling cleanup