diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 4ddf67fc1f..6433734c4b 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -258,7 +258,7 @@
 	if(escaped_total > 0)
 		feedback_set("escaped_total",escaped_total)
 	send2irc("Server", "Round just ended.")
-	send2maindiscord("Server", "Round just ended.")
+//	send2maindiscord("Server", "Round just ended.")
 	return 0
 
 
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index be7a264f97..b13462620a 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -150,8 +150,10 @@
 	src << "<span class='adminnotice'>PM to-<b>Admins</b>: [original_msg]</span>"
 
 	//send it to irc if nobody is on and tell us how many were on
-	var/admin_number_present = send2admindiscord("adminhelp", ckey, original_msg)
-	log_admin("ADMINHELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins who have +BAN.")
+	var/admin_number_present = send2irc_adminless_only(ckey,original_msg)
+	log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins who have +BAN.")
+	if(admin_number_present <= 0)
+		src << "<span class='notice'>No active admins are online, your adminhelp was sent to the admin irc.</span>"
 	feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return
 
@@ -184,7 +186,7 @@
 		else
 			final = "[msg] - All admins stealthed\[[english_list(stealthmins)]\], AFK\[[english_list(afkmins)]\], or lacks +BAN\[[english_list(powerlessmins)]\]! Total: [allmins.len] "
 		send2irc(source,final)
-		send2admindiscord(source,final)
+//		send2admindiscord(source,final)
 
 
 /proc/send2irc(msg,msg2)
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 6b81e28996..d3f2377161 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -281,7 +281,7 @@ var/next_external_rsc = 0
 		if (config.notify_new_player_age >= 0)
 			message_admins("New user: [key_name_admin(src)] is connecting here for the first time.")
 			if (config.irc_first_connection_alert)
-				send2admindiscord("New-user", "[key_name(src)] is connecting for the first time!")
+				send2irc_adminless_only("New-user", "[key_name(src)] is connecting for the first time!")
 
 		player_age = 0 // set it from -1 to 0 so the job selection code doesn't have a panic attack
 
@@ -444,7 +444,7 @@ var/next_external_rsc = 0
 
 			if (!cidcheck_failedckeys[ckey])
 				message_admins("<span class='adminnotice'>[key_name(src)] has been detected as using a cid randomizer. Connection rejected.</span>")
-				send2admindiscord("CidRandomizer", "[key_name(src)] has been detected as using a cid randomizer. Connection rejected.")
+				send2irc_adminless_only("CidRandomizer", "[key_name(src)] has been detected as using a cid randomizer. Connection rejected.")
 				cidcheck_failedckeys[ckey] = TRUE
 				note_randomizer_user()
 
@@ -455,7 +455,7 @@ var/next_external_rsc = 0
 		else
 			if (cidcheck_failedckeys[ckey])
 				message_admins("<span class='adminnotice'>[key_name_admin(src)] has been allowed to connect after showing they removed their cid randomizer</span>")
-				send2admindiscord("CidRandomizer", "[key_name(src)] has been allowed to connect after showing they removed their cid randomizer.")
+				send2irc_adminless_only("CidRandomizer", "[key_name(src)] has been allowed to connect after showing they removed their cid randomizer.")
 				cidcheck_failedckeys -= ckey
 			if (cidcheck_spoofckeys[ckey])
 				message_admins("<span class='adminnotice'>[key_name_admin(src)] has been allowed to connect after appearing to have attempted to spoof a cid randomizer check because it <i>appears</i> they aren't spoofing one this time</span>")
diff --git a/code/modules/jobs/job_types/cargo_service.dm b/code/modules/jobs/job_types/cargo_service.dm
index 9fe97f8253..52f6e6d742 100644
--- a/code/modules/jobs/job_types/cargo_service.dm
+++ b/code/modules/jobs/job_types/cargo_service.dm
@@ -173,7 +173,7 @@ Cook
 	department_head = list("Head of Personnel")
 	department_flag = CIVILIAN
 	faction = "Station"
-	total_positions = 2
+	total_positions = 1
 	spawn_positions = 1
 	supervisors = "the head of personnel"
 	selection_color = "#bbe291"
diff --git a/code/world.dm b/code/world.dm
index fa2285222b..17adf27ee6 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -102,7 +102,7 @@ var/last_irc_status = 0
 		status += "Players: [clients.len] (Active: [get_active_player_count(0,1,0)]). Mode: [ticker.mode.name]."
 		send2irc("Status", status)
 		last_irc_status = world.time
-		send2maindiscord("**Server starting up**. [clients.len] (Active: [get_active_player_count(0,1,0)]). Mode: [ticker.mode.name].`. Map is **Probably Box Station**")
+//		send2maindiscord("**Server starting up**. [clients.len] (Active: [get_active_player_count(0,1,0)]). Mode: [ticker.mode.name].`. Map is **Probably Box Station**")
 
 	else if("status" in input)
 		var/list/s = list()
diff --git a/tgstation.dme b/tgstation.dme
index 324fd77536..a1a37ea4b9 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -150,7 +150,6 @@
 #include "code\citadel\cit_kegs.dm"
 #include "code\citadel\cit_reagents.dm"
 #include "code\citadel\cit_uniforms.dm"
-#include "code\citadel\discordbot.dm"
 #include "code\citadel\organs\breasts.dm"
 #include "code\citadel\organs\eggsack.dm"
 #include "code\citadel\organs\genitals.dm"