Drop an unused file

Change-Id: I8ad19f77c199bac6890f2917b16588579ea12eae
Avoid possible memory leaks in case of exceptions

Change-Id: I45929aae52fa106b5f5c0199f8ce8b60c0ac5438