removed unnecessary fiels