removed unnecessary fields