speed up termination process and refactoring
adding applicationid to deployment policy