Remove unneeded checks