Removing some validation