* Fixes NB#91120, fixes a memory leak, removed invalid comments