removed unneeded checks