Cleanup aws to avoid nesting the proper return condition.