Removed some additional unneeded checks