i've written utilities to clean it up, but they're not ready for release and they might get merged into pulumi