Removed unneeded checks