Removed some un-needed checks