udpating cluster cleanup with instance iD
introducing undeployment of deployment policy-v1
fixing build failure and refactoring