diff --git a/code/modules/projectiles/attachables/rail.dm b/code/modules/projectiles/attachables/rail.dm
index 98507e5e8f8..85bf00d5f60 100644
--- a/code/modules/projectiles/attachables/rail.dm
+++ b/code/modules/projectiles/attachables/rail.dm
@@ -13,17 +13,7 @@
 	desc = "A B7 smart scope. Does not have a zoom feature, but allows you to take aim and fire through allies. \nNo drawbacks."
 	icon_state = "b7"
 	slot = ATTACHMENT_SLOT_RAIL
-	damage_mod = -0.15
-
-/obj/item/attachable/b7_scope/on_attach(attaching_item, mob/user)
-	. = ..()
-	var/obj/item/weapon/gun/attaching_gun = attaching_item
-	ENABLE_BITFIELD(attaching_gun.flags_gun_features, GUN_IFF)
-
-/obj/item/attachable/b7_scope/on_detach(detaching_item, mob/user)
-	. = ..()
-	var/obj/item/weapon/gun/detaching_gun = detaching_item
-	DISABLE_BITFIELD(detaching_gun.flags_gun_features, GUN_IFF)
+	add_aim_mode = TRUE
 
 /obj/item/attachable/m16sight
 	name = "M16 iron sights"
diff --git a/code/modules/projectiles/attachables/scope.dm b/code/modules/projectiles/attachables/scope.dm
index b0f46efe416..017edd8809c 100644
--- a/code/modules/projectiles/attachables/scope.dm
+++ b/code/modules/projectiles/attachables/scope.dm
@@ -28,7 +28,6 @@
 	name = "T-47 rail scope"
 	desc = "A marine standard mounted zoom sight scope. Allows zoom by activating the attachment."
 	icon_state = "marinescope"
-	add_aim_mode = TRUE
 
 /obj/item/attachable/scope/nightvision
 	name = "T-46 Night vision scope"
@@ -208,7 +207,6 @@
 	scope_zoom_mod = TRUE
 	has_nightvision = FALSE
 	zoom_allow_movement = TRUE
-	add_aim_mode = TRUE
 	zoom_slowdown = 0.3
 	zoom_tile_offset = 5
 	zoom_viewsize = 0
diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm
index 4d5cbd8ce0c..38fc4077c68 100644
--- a/code/modules/projectiles/guns/rifles.dm
+++ b/code/modules/projectiles/guns/rifles.dm
@@ -1029,7 +1029,6 @@
 	starting_attachment_types = list(/obj/item/attachable/stock/t60stock)
 	gun_skill_category = SKILL_HEAVY_WEAPONS
 	attachable_offset = list("muzzle_x" = 42, "muzzle_y" = 21,"rail_x" = 6, "rail_y" = 23, "under_x" = 26, "under_y" = 15, "stock_x" = 8, "stock_y" = 13)
-	actions_types = list(/datum/action/item_action/aim_mode)
 	aim_fire_delay = 0.15 SECONDS
 	aim_speed_modifier = 5.3