Removed redundant validation loop