SWITCHYARD-1441 - Further cleanup to a few controls
SWITCHYARD-1445 - Adding check for file existence