removed some unused field and methods