removed unused fields