diff --git a/Code/Tools/CrashHandler/Uploader/include/Uploader/BufferedDataStream.h b/Code/Tools/CrashHandler/Uploader/include/Uploader/BufferedDataStream.h
deleted file mode 100644
index 944fde999d..0000000000
--- a/Code/Tools/CrashHandler/Uploader/include/Uploader/BufferedDataStream.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <minidump/minidump_user_extension_stream_data_source.h>
-#include <vector>
-
-namespace O3de
-{
-    class BufferedDataStream : public crashpad::MinidumpUserExtensionStreamDataSource
-    {
-    public:
-        BufferedDataStream(uint32_t stream_type, const void* data, size_t data_size);
-
-        size_t StreamDataSize() override;
-        bool ReadStreamData(Delegate* delegate) override;
-
-    private:
-        std::vector<uint8_t> data_;
-
-        BufferedDataStream(const BufferedDataStream& rhs) = delete;
-        BufferedDataStream& operator=(const BufferedDataStream& rhs) = delete;
-    };
-
-}
diff --git a/Code/Tools/CrashHandler/Uploader/include/Uploader/FileStreamDataSource.h b/Code/Tools/CrashHandler/Uploader/include/Uploader/FileStreamDataSource.h
deleted file mode 100644
index 6a3e11728c..0000000000
--- a/Code/Tools/CrashHandler/Uploader/include/Uploader/FileStreamDataSource.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-
-#pragma once
-
-#include <handler/user_stream_data_source.h>
-#include "base/files/file_path.h"
-
-namespace O3de
-{
-    class FileStreamDataSource : public crashpad::UserStreamDataSource
-    {
-    public:
-        FileStreamDataSource(const base::FilePath& filePath);
-
-        std::unique_ptr<crashpad::MinidumpUserExtensionStreamDataSource> ProduceStreamData(crashpad::ProcessSnapshot* process_snapshot) override;
-
-    private:
-        FileStreamDataSource(const FileStreamDataSource& rhs) = delete;
-        FileStreamDataSource& operator=(const FileStreamDataSource& rhs) = delete;
-
-        base::FilePath m_filePath;
-    };
-}
diff --git a/Code/Tools/CrashHandler/Uploader/src/BufferedDataStream.cpp b/Code/Tools/CrashHandler/Uploader/src/BufferedDataStream.cpp
deleted file mode 100644
index b4350b29d5..0000000000
--- a/Code/Tools/CrashHandler/Uploader/src/BufferedDataStream.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <BufferedDataStream.h>
-
-namespace O3de
-{
-    BufferedDataStream::BufferedDataStream(uint32_t stream_type, const void* data, size_t data_size)
-        : crashpad::MinidumpUserExtensionStreamDataSource(stream_type)
-    {
-        data_.resize(data_size);
-
-        if (data_size)
-        {
-            memcpy(data_.data(), data, data_size);
-        }
-    }
-
-    size_t BufferedDataStream::StreamDataSize()
-    {
-        return data_.size();
-    }
-
-    bool BufferedDataStream::ReadStreamData(Delegate* delegate)
-    {
-        return delegate->ExtensionStreamDataSourceRead(data_.size() ? data_.data() : nullptr, data_.size());
-    }
-}
-
diff --git a/Code/Tools/CrashHandler/Uploader/src/FileStreamDataSource.cpp b/Code/Tools/CrashHandler/Uploader/src/FileStreamDataSource.cpp
deleted file mode 100644
index f490189057..0000000000
--- a/Code/Tools/CrashHandler/Uploader/src/FileStreamDataSource.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) Contributors to the Open 3D Engine Project.
- * For complete copyright and license terms please see the LICENSE at the root of this distribution.
- *
- * SPDX-License-Identifier: Apache-2.0 OR MIT
- *
- */
-
-#include <FileStreamDataSource.h>
-#include <BufferedDataStream.h>
-
-#include <memory>
-
-namespace O3de
-{
-    FileStreamDataSource::FileStreamDataSource(const base::FilePath& filePath) :
-        m_filePath{ filePath }
-    {
-
-    }
-
-    std::unique_ptr<crashpad::MinidumpUserExtensionStreamDataSource> FileStreamDataSource::ProduceStreamData(crashpad::ProcessSnapshot* process_snapshot) 
-    {
-        static constexpr char testBuffer[] = "Test Data From buffer.";
-
-        return std::make_unique<BufferedDataStream>( 0xCAFEBABE, testBuffer, sizeof(testBuffer));
-    }
-}
-