fix - revert logic, add general flow.

Change-Id: I07e004301cbcae25dd101cdd562adb05f36bb5b0
rm - .deploy file logic - not needed.

Change-Id: I0a755842e733170f898825869173a78ca99f863d