Removed some uneeded filed