Get rid of surplus items instead of just raising an error