added connection removal support for undeployment