removed a couple unneeded checks