Cleanup for AWS migration.