Remove unused (and very wrong at this level) private fields