Drop unused variable Remove commented-out code Fix leak by using Vector instead of raw memory (cherry picked from commit 0e1972aa51)
0e1972aa51