Removed unnecessary fiels