removing unused fields