Adding support for edge manager cleanup.