Remove memory leak precaution based on #636