[unity-scopes] Cleanup and rebuild