SWITCHYARD-1457 tooling cleanup