SWITCHYARD-1574 API cleanup

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