Remove uneeded checks