Removing unnecessary fiels