Remove additional unnecessary checks