Eliminated memory leak