Fixing Memory leak for E2 in dawn branch