Removed redundant fields