* Fixes NB#90705, commented an unused function and added a couple of initializations