Removed unnecessary validation checks