Removed star & some unused fields