cleanup, change assert to assertNull, revert edgedeletelistener,