Removed unecessary argument checks