Remove WPRO
Add AWS and WP TanTan S3