SWITCHYARD-340 Additional cleanup