Got rid of inappropriate assert statements