* Fixes NB#91153, removed two unused fields