Cleanup for env-exports