Minor changes - remove some unused fields