Get rid of extra assertions