Removing Dependency from native AWS libraries.