removed redundant fields