SWITCHYARD-1441 - Further cleanup to a few controls