diff --git a/Content.Client/_CD/CryoSleep/AcceptCryoWindow.cs b/Content.Client/_CD/CryoSleep/AcceptCryoWindow.cs
deleted file mode 100644
index 197037937f..0000000000
--- a/Content.Client/_CD/CryoSleep/AcceptCryoWindow.cs
+++ /dev/null
@@ -1,60 +0,0 @@
-using Robust.Client.UserInterface;
-using Robust.Client.UserInterface.Controls;
-using Robust.Client.UserInterface.CustomControls;
-using Robust.Shared.Localization;
-using static Robust.Client.UserInterface.Controls.BoxContainer;
-
-namespace Content.Client._CD.CryoSleep;
-public sealed class AcceptCryoWindow : DefaultWindow
-{
-    public readonly Button DenyButton;
-    public readonly Button AcceptButton;
-
-    public AcceptCryoWindow()
-    {
-
-        Title = Loc.GetString("accept-cryo-window-title");
-
-        Contents.AddChild(new BoxContainer
-        {
-            Orientation = LayoutOrientation.Vertical,
-            Children =
-            {
-                new BoxContainer
-                {
-                    Orientation = LayoutOrientation.Vertical,
-                    Children =
-                    {
-                        (new Label()
-                        {
-                            Text = Loc.GetString("accept-cryo-window-prompt-text-part")
-                        }),
-                        new BoxContainer
-                        {
-                            Orientation = LayoutOrientation.Horizontal,
-                            Align = AlignMode.Center,
-                            Children =
-                            {
-                                (AcceptButton = new Button
-                                {
-                                    Text = Loc.GetString("accept-cryo-window-accept-button"),
-                                }),
-
-                                (new Control()
-                                {
-                                    MinSize = new Vector2i(20, 0)
-                                }),
-
-                                (DenyButton = new Button
-                                {
-                                    Text = Loc.GetString("accept-cryo-window-deny-button"),
-                                })
-                            }
-                        },
-                    }
-                },
-            }
-        });
-    }
-}
-
diff --git a/Content.Client/_CD/CryoSleep/CryoSleepEui.cs b/Content.Client/_CD/CryoSleep/CryoSleepEui.cs
deleted file mode 100644
index 96af73b5d3..0000000000
--- a/Content.Client/_CD/CryoSleep/CryoSleepEui.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using Content.Client.Eui;
-using Content.Shared._CD.CryoSleep;
-using JetBrains.Annotations;
-using Robust.Client.Graphics;
-
-namespace Content.Client._CD.CryoSleep;
-
-[UsedImplicitly]
-public sealed class CryoSleepEui : BaseEui
-{
-    private readonly AcceptCryoWindow _window;
-
-    public CryoSleepEui()
-    {
-        _window = new AcceptCryoWindow();
-
-        _window.DenyButton.OnPressed += _ =>
-        {
-            SendMessage(new AcceptCryoChoiceMessage(AcceptCryoUiButton.Deny));
-            _window.Close();
-        };
-
-        _window.AcceptButton.OnPressed += _ =>
-        {
-            SendMessage(new AcceptCryoChoiceMessage(AcceptCryoUiButton.Accept));
-            _window.Close();
-        };
-    }
-
-    public override void Opened()
-    {
-        IoCManager.Resolve<IClyde>().RequestWindowAttention();
-        _window.OpenCentered();
-    }
-
-    public override void Closed()
-    {
-        _window.Close();
-    }
-
-}
diff --git a/Content.Server/_CD/Storage/Components/LostAndFoundComponent.cs b/Content.Server/_CD/Storage/Components/LostAndFoundComponent.cs
deleted file mode 100644
index 8a8db1f2c9..0000000000
--- a/Content.Server/_CD/Storage/Components/LostAndFoundComponent.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Content.Server._CD.Storage.Components;
-
-[RegisterComponent]
-public sealed partial class LostAndFoundComponent : Component
-{
-
-}
diff --git a/Resources/Locale/en-US/_CD/cryosleep/cryosleep-component.ftl b/Resources/Locale/en-US/_CD/cryosleep/cryosleep-component.ftl
deleted file mode 100644
index a417e94684..0000000000
--- a/Resources/Locale/en-US/_CD/cryosleep/cryosleep-component.ftl
+++ /dev/null
@@ -1,7 +0,0 @@
-## UI
-accept-cryo-window-accept-button = Accept
-accept-cryo-window-deny-button = Cancel
-accept-cryo-window-prompt-text-part = Enter cryo sleep and finish your shift as this character?
-accept-cryo-window-title = Cryo Sleep Chamber
-
-cryo-leave-announcement = {$character} ({$job}) is entering cryosleep. 
\ No newline at end of file
diff --git a/Resources/Prototypes/_CD/Entities/Structures/Storage/lockers.yml b/Resources/Prototypes/_CD/Entities/Structures/Storage/lockers.yml
deleted file mode 100644
index b124e00313..0000000000
--- a/Resources/Prototypes/_CD/Entities/Structures/Storage/lockers.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: entity
-  parent: LockerBaseSecure
-  id: LockerLostAndFound
-  name: lost and found locker
-  components:
-  - type: LostAndFound
-  - type: EntityStorage
-    capacity: 999 # Supposed to fit a lot.
-  - type: Appearance
-  - type: EntityStorageVisuals
-    stateBaseClosed: lostandfound
-    stateDoorOpen: lostandfound_open
-    stateDoorClosed: lostandfound_door
-  - type: AccessReader
-    access: [["HeadOfPersonnel"]]
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/lostandfound.png b/Resources/Textures/Structures/Storage/closet.rsi/lostandfound.png
deleted file mode 100644
index 2991a3ced1..0000000000
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/lostandfound.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/lostandfound_door.png b/Resources/Textures/Structures/Storage/closet.rsi/lostandfound_door.png
deleted file mode 100644
index ed87665239..0000000000
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/lostandfound_door.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/lostandfound_open.png b/Resources/Textures/Structures/Storage/closet.rsi/lostandfound_open.png
deleted file mode 100644
index 22443c0d2f..0000000000
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/lostandfound_open.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
index 46f5f2be9e..5600268fde 100644
--- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
@@ -4,7 +4,7 @@
     "x": 32,
     "y": 32
   },
-  "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2 sprites based on fire and emergency sprites, lostandfound by PursuitInAshes",
+  "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2 sprites based on fire and emergency sprites",
   "license": "CC-BY-SA-3.0",
   "states": [
     {
@@ -364,15 +364,6 @@
     },
     {
       "name": "locked"
-    },
-	{
-      "name": "lostandfound"
-    },
-    {
-      "name": "lostandfound_door"
-    },
-    {
-      "name": "lostandfound_open"
     },
     {
       "name": "med"
diff --git a/Resources/migration.yml b/Resources/migration.yml
index 6cb7730fe9..cc1c52e7f7 100644
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -493,4 +493,7 @@ HeadBorgJanitor: LightHeadBorg
 TorsoBorgJanitor: TorsoBorg
 
 # Umbra - RMC Blood Rework
-Bloodpack : CMBloodPackFull
\ No newline at end of file
+Bloodpack: CMBloodPackFull
+
+# Umbra - Revert CD Cryo
+LockerLostAndFound: LockerRepresentative