Improvements from Phil's feedback

 - Extract disable deployment from the switch
 - Introduce postCleanup event so we are not guessing when we can shutdown