removed redundant fields
removed user