Remove redundant fields