diff --git a/facades/PC/build.gradle.kts b/facades/PC/build.gradle.kts
index 0a06c2fc87e..d1181f15f0d 100644
--- a/facades/PC/build.gradle.kts
+++ b/facades/PC/build.gradle.kts
@@ -59,13 +59,6 @@ logger.info("PC VERSION: {}", version)
 // Jenkins-Artifactory integration catches on to this as part of the Maven-type descriptor
 group = "org.terasology.facades"
 
-configurations {
-    register("serverModules") {
-        description = "for fetching modules for running a server"
-        isTransitive = false
-    }
-}
-
 dependencies {
     implementation(project(":engine"))
     implementation(group = "org.reflections", name = "reflections", version = "0.9.10")
@@ -105,37 +98,9 @@ tasks.register<RunTerasology>("permissiveNatives") {
     systemProperty("java.library.path", rootProject.file(dirNatives + "/" + nativeSubdirectoryName()))
 }
 
-/******************************************
- * Headless server
- */
-
-apply(from="server.build.gradle")
-
-// TODO: Seems to always be up to date so no modules get copied
-tasks.register<Sync>("setupServerModules") {
-    description =
-        """Parses "extraModules" - a comma-separated list of modules and puts them into $localServerDataPath"""
-
-    val extraModules: String? by project
-    extraModules?.let {
-        // Grab modules from Artifactory - cheats by declaring them as dependencies
-        it.splitToSequence(",").forEach {
-            logger.info("Extra module: {}", it)
-            dependencies {
-                "serverModules"(group = "org.terasology.modules", name = it, version = "+")
-            }
-        }
-    }
-
-    from(configurations.named("serverModules"))
-    into(File(rootProject.file(localServerDataPath), "modules"))
-}
-
 // TODO: Make a task to reset server / game data
 tasks.register<RunTerasology>("server") {
     description = "Starts a headless multiplayer server with data stored in [project-root]/$localServerDataPath"
-    dependsOn("setupServerConfig")
-    dependsOn("setupServerModules")
     args("-headless", "-homedir=$localServerDataPath")
 }
 
@@ -276,10 +241,6 @@ tasks.named<CreateStartScripts>("startScripts") {
     }
 }
 
-// NOTE: If you build a distribution while you have modules, all the test dependencies are in here.
-//     They're "optional" in module.txt and gradle doesn't know how to tell which are runtime and which are
-//     test-only.
-
 distributions {
     main {
         contents {
diff --git a/facades/PC/server.build.gradle b/facades/PC/server.build.gradle
deleted file mode 100644
index bff1503083e..00000000000
--- a/facades/PC/server.build.gradle
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2020 The Terasology Foundation
-// SPDX-License-Identifier: Apache-2.0
-
-// This is still in Groovy because the embedded Groovy has a JsonBuilder.
-import groovy.json.JsonBuilder
-
-
-// TODO: This is not the Gradle Way. Needs more declared output-fu to determine up-to-date instead of the if
-tasks.register("setupServerConfig") {
-    description "Parses parameters passed via Gradle and writes them to the local run-from-source server dir's config.cfg"
-
-    def json = new JsonBuilder()
-
-    def serverRoot = rootProject.file(localServerDataPath);
-    def config = new File(serverRoot, 'config.cfg')
-
-    if (!config.exists()) {
-
-        serverRoot.mkdir()
-        logger.lifecycle("Creating config file $config")
-
-        json {
-            worldGeneration {
-                if (project.hasProperty('seed')) {
-                    logger.lifecycle("  Seed value: $seed");
-                    defaultSeed seed
-                }
-                if (project.hasProperty('worldGen')) {
-                    logger.lifecycle("  World Generator: $worldGen");
-                    defaultGenerator worldGen
-                }
-            }
-            defaultModSelection {
-                if (project.hasProperty('extraModules')) {
-                    logger.lifecycle("  Enabling modules: $extraModules");
-                    modules extraModules.tokenize(" ,")
-                }
-            }
-        }
-        config.text = json.toPrettyString()
-    }
-}