Drop commented-out code

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

Change-Id: Ic84b7275f3dfa9a7db47757f94d82b0036fd42da