Also update delete- warning, breaks tests.