SWITCHYARD-1574 API cleanup