Got rid of a couple of useless checks