Removing unused fields