diff --git a/bake/utopia.rb b/bake/utopia.rb
index 90e11c9c..c4c97078 100644
--- a/bake/utopia.rb
+++ b/bake/utopia.rb
@@ -15,5 +15,5 @@ def environment(name: nil)
 def development
 	self.environment
 	
-	exec("guard", "-g", "development")
+	exec("falcon", "serve")
 end
diff --git a/bake/utopia/site.rb b/bake/utopia/site.rb
index e30c96ec..4723bbe6 100644
--- a/bake/utopia/site.rb
+++ b/bake/utopia/site.rb
@@ -18,13 +18,13 @@ def initialize(...)
 SETUP_ROOT = File.expand_path("../../setup", __dir__)
 
 # Configuration files which should be installed/updated:
-CONFIGURATION_FILES = [".gitignore", "config.ru", "config/environment.rb", "falcon.rb", "gems.rb", "Guardfile", "bake.rb", "test/website.rb", "fixtures/website.rb"]
+CONFIGURATION_FILES = [".gitignore", "config.ru", "config/environment.rb", "falcon.rb", "gems.rb", "bake.rb", "test/website.rb", "fixtures/website.rb"]
 
 # Directories that should exist:
 DIRECTORIES = ["config", "lib", "pages", "public", "bake", "fixtures", "test"]
 
 # Directories that should be removed during upgrade process:
-OLD_PATHS = ["access_log", "cache", "tmp", "Rakefile", "tasks", ".bowerrc"]
+OLD_PATHS = ["access_log", "cache", "tmp", "Rakefile", "tasks", ".bowerrc", "Guardfile"]
 
 # The root directory of the template site:
 SITE_ROOT = File.join(SETUP_ROOT, "site")
diff --git a/gems.rb b/gems.rb
index 094d4bd5..3930cda9 100644
--- a/gems.rb
+++ b/gems.rb
@@ -41,7 +41,5 @@
 	
 	gem "benchmark-ips"
 	
-	gem "guard-falcon"
-	
 	gem "rack-test"
 end
diff --git a/setup/site/Guardfile b/setup/site/Guardfile
deleted file mode 100644
index ea4d4698..00000000
--- a/setup/site/Guardfile
+++ /dev/null
@@ -1,12 +0,0 @@
-# frozen_string_literal: true
-
-group :development do
-	guard :falcon, port: 9292 do
-		watch("Gemfile.lock")
-		watch("gems.locked")
-		watch("config.ru")
-		watch(%r{^config|lib|pages/.*})
-		
-		notification :off
-	end
-end
diff --git a/setup/site/gems.rb b/setup/site/gems.rb
index b22869d7..b6aa6728 100644
--- a/setup/site/gems.rb
+++ b/setup/site/gems.rb
@@ -18,7 +18,6 @@
 group :development do
 	gem "bake-test"
 	gem "rack-test"
-	gem "guard-falcon", require: false
 	
 	gem "sus"
 	gem "sus-fixtures-async-http"
diff --git a/setup/site/readme.md b/setup/site/readme.md
index 6db5cd26..7cce98c9 100644
--- a/setup/site/readme.md
+++ b/setup/site/readme.md
@@ -9,8 +9,5 @@ To start the development server, simply execute
 	> bake
 	Generating transient session key for development...
 	20:57:36 - INFO - Starting Falcon HTTP server on localhost:9292
-	20:57:36 - INFO - Guard::RSpec is running
-	20:57:36 - INFO - Guard is now watching at '...'
-	[1] guard(main)>
 
 Then browse https://localhost:9292 (or as specified) to see your new site.