Move the aws delete helpers into aws provider class