diff --git a/ui/build/build.go b/ui/build/build.go
index 26f5969..e0c9e6d 100644
--- a/ui/build/build.go
+++ b/ui/build/build.go
@@ -38,11 +38,9 @@
 	// Note that the absence of the  file does not not preclude running Kati for product
 	// configuration purposes.
 	katiEnabledMarker := filepath.Join(config.SoongOutDir(), ".soong.kati_enabled")
-	if config.SkipKatiNinja() {
+	if config.SkipKati() || config.SkipKatiNinja() {
 		os.Remove(katiEnabledMarker)
-		// Note that we can not remove the file for SkipKati builds yet -- some continuous builds
-		// --skip-make builds rely on kati targets being defined.
-	} else if !config.SkipKati() {
+	} else {
 		ensureEmptyFileExists(ctx, katiEnabledMarker)
 	}
 
@@ -52,7 +50,7 @@
 	ensureEmptyFileExists(ctx, filepath.Join(config.OutDir(), ".out-dir"))
 
 	if buildDateTimeFile, ok := config.environ.Get("BUILD_DATETIME_FILE"); ok {
-		err := ioutil.WriteFile(buildDateTimeFile, []byte(config.buildDateTime), 0666) // a+rw
+		err := os.WriteFile(buildDateTimeFile, []byte(config.buildDateTime), 0666) // a+rw
 		if err != nil {
 			ctx.Fatalln("Failed to write BUILD_DATETIME to file:", err)
 		}