Removed redundant validation