Remove fields not used for main analysis