Removed unecessary validation