Removed unused fields and property.