Modifications to the control App
Removed the yapp test