remove commented out code

remove commented out code
Remove debug code change

Remove debug code change for validate option