Unnecessary filed were removed