diff --git a/.yamato/project-standards.yml b/.yamato/project-standards.yml
index 1cbc689d7e..5b4cfe62ef 100644
--- a/.yamato/project-standards.yml
+++ b/.yamato/project-standards.yml
@@ -13,4 +13,4 @@ standards_{{ projects.first.name }}:
     - pip install unity-downloader-cli --upgrade --index-url https://artifactory.prd.it.unity3d.com/artifactory/api/pypi/pypi/simple
     - unity-downloader-cli -u {{ projects.first.test_editors.first }} -c editor --wait --fast
     - .Editor/Unity -batchmode -nographics -logFile - -executeMethod Packages.Rider.Editor.RiderScriptEditor.SyncSolution -projectPath {{ projects.first.path }} -quit
-    - ./standards.py --tool-path $HOME/.dotnet/tools/dotnet-format --project-path {{ projects.first.path }} --yamato
+    - ./standards.py --tool-path $HOME/.dotnet/tools/dotnet-format --project-path {{ projects.first.path }} --check
diff --git a/standards.py b/standards.py
index 48e3136022..5f847c7750 100755
--- a/standards.py
+++ b/standards.py
@@ -14,7 +14,6 @@
 parser.add_argument("--unhook", action="store_true")
 parser.add_argument("--check", action="store_true")
 parser.add_argument("--fix", action="store_true")
-parser.add_argument("--yamato", action="store_true")
 
 parser.add_argument("--verbosity", default="minimal")
 parser.add_argument("--tool-path", default="dotnet-format")
@@ -72,7 +71,7 @@
     print("unhook: succeeded")
 
 
-if args.check or args.fix or args.yamato:
+if args.check or args.fix:
     glob_match = os.path.join(args.project_path, args.project_glob)
     glob_files = glob.glob(glob_match)
     print(f"glob: found {len(glob_files)} files matching -> {glob_match}")
@@ -123,14 +122,3 @@
         exit("fix: failed")
 
     print("fix: succeeded")
-
-if args.yamato:
-    print("yamato: execute")
-
-    for project_file in glob_files:
-        print(f"yamato: project -> {project_file}")
-        yamato_exec = os.system(f"{args.tool_path} {project_file} --fix-style error --check --verbosity {args.verbosity}")
-        if yamato_exec != 0:
-            exit(f"yamato: failed, exit code -> {yamato_exec}")
-
-    print("yamato: succeeded")
diff --git a/testproject/Assets/Tests/Manual/Scripts/ConnectionApprovalComponent.cs b/testproject/Assets/Tests/Manual/Scripts/ConnectionApprovalComponent.cs
index 7ba7fefc5e..bd25b3f16a 100644
--- a/testproject/Assets/Tests/Manual/Scripts/ConnectionApprovalComponent.cs
+++ b/testproject/Assets/Tests/Manual/Scripts/ConnectionApprovalComponent.cs
@@ -137,7 +137,7 @@ public override void OnNetworkSpawn()
         /// </summary>
         public void OnDisconnectClient()
         {
-            if ( NetworkManager != null && NetworkManager.IsListening && !NetworkManager.IsServer)
+            if (NetworkManager != null && NetworkManager.IsListening && !NetworkManager.IsServer)
             {
                 NetworkManager.Shutdown();
                 m_ConnectionModeButtons.Reset();
diff --git a/testproject/Assets/Tests/Runtime/MultiClientConnectionApproval.cs b/testproject/Assets/Tests/Runtime/MultiClientConnectionApproval.cs
index d96c970b6d..99af046da1 100644
--- a/testproject/Assets/Tests/Runtime/MultiClientConnectionApproval.cs
+++ b/testproject/Assets/Tests/Runtime/MultiClientConnectionApproval.cs
@@ -250,7 +250,7 @@ private void Server_OnClientConnectedCallback(ulong clientId)
         /// </summary>
         /// <returns></returns>
         [UnityTest]
-        public IEnumerator ConnectionApprovalMismatchTest([Values(true, false)] bool enableSceneManagement, [Values(true,false)] bool connectionApproval)
+        public IEnumerator ConnectionApprovalMismatchTest([Values(true, false)] bool enableSceneManagement, [Values(true, false)] bool connectionApproval)
         {
             m_ServerClientDisconnectedInvocations = 0;