Removed unnecessary fields