Removing unneeded checks