Removed unnecessary validation