Fixed COOK-2935
Removed commented out code
Merge branch 'COOK-2935' of github.com:joelmoss/aws into joelmoss-COOK-2935