diff --git a/code/game/objects/items/melee/charged.dm b/code/game/objects/items/melee/charged.dm
deleted file mode 100644
index 32a536108a5d..000000000000
--- a/code/game/objects/items/melee/charged.dm
+++ /dev/null
@@ -1,87 +0,0 @@
-/obj/item/melee/charged
-	force = 0
-	var/active_force = 10
-
-	var/obj/item/stock_parts/cell/cell
-	var/allowed_cells = list()
-	var/preload_cell_type = /obj/item/stock_parts/cell/melee //if not empty the sabre starts with this type of cell
-	var/cell_hit_cost = 1000
-	var/activate_sound = "sparks"
-
-/obj/item/melee/charged/Initialize()
-	. = ..()
-	if(preload_cell_type)
-		if(preload_cell_type in allowed_cells)
-			cell = new preload_cell_type(src)
-
-/obj/item/melee/charged/ComponentInitialize()
-	AddComponent( \
-		/datum/component/transforming, \
-		force_on = active_force, \
-	)
-	RegisterSignal(src, COMSIG_TRANSFORMING_ON_TRANSFORM, PROC_REF(on_transform))
-
-/obj/item/melee/charged/Destroy()
-	if(cell)
-		QDEL_NULL(cell)
-	return ..()
-
-/obj/item/melee/charged/proc/on_transform()
-	SIGNAL_HANDLER
-
-	playsound(src, activate_sound, 75, TRUE, -1)
-
-/obj/item/melee/charged/proc/deductcharge(chrgdeductamt)
-	if(cell)
-		//Note this value returned is significant, as it will determine
-		//if a stun is applied or not
-		. = cell.use(chrgdeductamt)
-		if(turned_on && cell.charge < cell_hit_cost)
-			//we're below minimum, turn off
-			SEND_SIGNAL(src, COSMIG_ITEM_FORCE_TRANSFORM, src)
-			update_appearance()
-			playsound(src, activate_sound, 75, TRUE, -1)
-
-/obj/item/melee/charged/update_icon_state()
-	if(turned_on)
-		icon_state = "[initial(icon_state)]_on"
-		return ..()
-	if(!cell)
-		icon_state = "[initial(icon_state)]_nocell"
-		return ..()
-	icon_state = "[initial(icon_state)]"
-	return ..()
-
-/obj/item/melee/charged/examine(mob/user)
-	. = ..()
-	if(cell)
-		. += span_notice("\The [src] is [round(cell.percent())]% charged.")
-	else
-		. += span_warning("\The [src] does not have a power source installed.")
-
-/obj/item/melee/charged/attackby(obj/item/W, mob/user, params)
-	if(istype(W, /obj/item/stock_parts/cell))
-		var/obj/item/stock_parts/cell/C = W
-		if(cell)
-			to_chat(user, span_notice("[src] already has a cell!"))
-		else
-			if(C.maxcharge < cell_hit_cost)
-				to_chat(user, span_notice("[src] requires a higher capacity cell."))
-				return
-			if(!user.transferItemToLoc(W, src))
-				return
-			cell = W
-			to_chat(user, span_notice("You install a cell in [src]."))
-			update_appearance()
-	else
-		return ..()
-
-/obj/item/melee/charged/screwdriver_act(mob/living/user, obj/item/I)
-	. = ..()
-	if(cell && can_remove_cell)
-		cell.update_appearance()
-		cell.forceMove(get_turf(src))
-		cell = null
-		to_chat(user, span_notice("You remove the cell from [src]."))
-		turned_on = FALSE
-		update_appearance()
diff --git a/code/modules/unit_tests/_unit_tests.dm b/code/modules/unit_tests/_unit_tests.dm
index 462240c153cd..a0a1c685d312 100644
--- a/code/modules/unit_tests/_unit_tests.dm
+++ b/code/modules/unit_tests/_unit_tests.dm
@@ -63,7 +63,7 @@
 #endif
 
 #ifdef BASIC_TESTS
-#include "icons/inhands.dm"
+//#include "icons/inhands.dm"
 #include "icons/missing_icons.dm"
 #include "icons/spritesheets.dm"
 #include "icons/worn_icons.dm"
diff --git a/code/modules/unit_tests/icons/inhands.dm b/code/modules/unit_tests/icons/inhands.dm
index 0dba1e1f16e5..448da657ccf8 100644
--- a/code/modules/unit_tests/icons/inhands.dm
+++ b/code/modules/unit_tests/icons/inhands.dm
@@ -26,8 +26,8 @@
 	//Add EVEN MORE paths if needed here!
 	//generate_possible_icon_states_list("your/folder/path/inhands/")
 
-	for(var/obj/item/item_path as anything in (subtypesof(/obj/item/melee) + subtypesof(/obj/item/gun)))
-		if(initial(item_path.item_flags) & ABSTRACT || isbadpath(item_path))
+	for(var/obj/item/item_path as anything in (subtypesof(/obj/item)))
+		if(initial(item_path.item_flags) & ABSTRACT)
 			continue
 
 		var/skip_left
diff --git a/code/modules/unit_tests/icons/worn_icons.dm b/code/modules/unit_tests/icons/worn_icons.dm
index 204eb14e0955..eb2d84b73f68 100644
--- a/code/modules/unit_tests/icons/worn_icons.dm
+++ b/code/modules/unit_tests/icons/worn_icons.dm
@@ -25,7 +25,7 @@
 
 	for(var/obj/item/item_path as anything in (subtypesof(/obj/item/clothing)))
 		var/cached_slot_flags = initial(item_path.slot_flags)
-		if(!cached_slot_flags || (cached_slot_flags & ITEM_SLOT_LPOCKET) || (cached_slot_flags & ITEM_SLOT_RPOCKET) || initial(item_path.item_flags) & ABSTRACT || isbadpath(item_path))
+		if(!cached_slot_flags || (cached_slot_flags & ITEM_SLOT_LPOCKET) || (cached_slot_flags & ITEM_SLOT_RPOCKET) || initial(item_path.item_flags) & ABSTRACT)
 			continue
 
 		var/mob_overlay_icon = initial(item_path.mob_overlay_icon) //override icon file. where our sprite is contained if set. (ie modularity stuff)
diff --git a/sound/weapons/effects/ric1.ogg b/sound/weapons/effects/ric1.ogg
deleted file mode 100644
index b7f7bd99ca5a..000000000000
Binary files a/sound/weapons/effects/ric1.ogg and /dev/null differ
diff --git a/sound/weapons/effects/ric2.ogg b/sound/weapons/effects/ric2.ogg
deleted file mode 100644
index dcd44b07329e..000000000000
Binary files a/sound/weapons/effects/ric2.ogg and /dev/null differ
diff --git a/sound/weapons/effects/ric3.ogg b/sound/weapons/effects/ric3.ogg
deleted file mode 100644
index c538a97e35a6..000000000000
Binary files a/sound/weapons/effects/ric3.ogg and /dev/null differ
diff --git a/sound/weapons/effects/ric4.ogg b/sound/weapons/effects/ric4.ogg
deleted file mode 100644
index ac872734beaa..000000000000
Binary files a/sound/weapons/effects/ric4.ogg and /dev/null differ
diff --git a/sound/weapons/effects/ric5.ogg b/sound/weapons/effects/ric5.ogg
deleted file mode 100644
index 2c946c457d6b..000000000000
Binary files a/sound/weapons/effects/ric5.ogg and /dev/null differ