Removed some unnecessary fields