SWITCHYARD-1457 tooling cleanup

https://issues.jboss.org/browse/SWITCHYARD-1457