remove aws validation
Merge branch 'Fodoj-remove-aws-validation'