Removed some unused fields