Removed unnecessary fields from state