Cleanup of AWS setup