From afa3a13d41e193f618e63de3b4840b0f970057fb Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Thu, 14 Nov 2024 21:23:42 -0600
Subject: [PATCH] [keel] Cleanup

---
 src/olympic/keel/include/keel/assetmanager.hpp | 5 +----
 src/olympic/keel/include/keel/typeconv.hpp     | 3 ---
 src/olympic/keel/src/typeconv.cpp              | 2 --
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/olympic/keel/include/keel/assetmanager.hpp b/src/olympic/keel/include/keel/assetmanager.hpp
index ca6e6cf8..71807406 100644
--- a/src/olympic/keel/include/keel/assetmanager.hpp
+++ b/src/olympic/keel/include/keel/assetmanager.hpp
@@ -14,8 +14,6 @@
 #include <ox/std/hashmap.hpp>
 #include <ox/std/utility.hpp>
 
-#include "validation.hpp"
-
 namespace keel {
 
 class AssetManager;
@@ -190,7 +188,7 @@ class AssetManager {
 	private:
 		class AssetTypeManagerBase: public ox::SignalHandler {
 			public:
-				virtual ~AssetTypeManagerBase() = default;
+				~AssetTypeManagerBase() override = default;
 
 				virtual void gc() noexcept = 0;
 		};
@@ -217,7 +215,6 @@ class AssetManager {
 				ox::Result<AssetRef<T>> loadAsset(ox::StringView const assetId) noexcept {
 					auto &p = m_cache[assetId];
 					oxRequireM(obj, m_loader(assetId));
-					oxReturnError(ensureValid(obj));
 					if (!p) {
 						p = ox::make_unique<AssetContainer<T>>(std::move(obj));
 					} else {
diff --git a/src/olympic/keel/include/keel/typeconv.hpp b/src/olympic/keel/include/keel/typeconv.hpp
index 94ac91ef..5d72f359 100644
--- a/src/olympic/keel/include/keel/typeconv.hpp
+++ b/src/olympic/keel/include/keel/typeconv.hpp
@@ -7,8 +7,6 @@
 #include <ox/std/def.hpp>
 #include <ox/std/error.hpp>
 #include <ox/std/string.hpp>
-#include <ox/claw/read.hpp>
-#include <ox/claw/write.hpp>
 
 #include "asset.hpp"
 #include "context.hpp"
@@ -119,7 +117,6 @@ class Converter: public BaseConverter {
 		ox::Result<ox::UPtr<Wrap>> convertBuffToPtr(
 				keel::Context &ctx, ox::BufferView const&srcBuff) const noexcept final {
 			oxRequireM(src, readAsset<SrcType>(srcBuff));
-			oxReturnError(ensureValid(src));
 			auto dst = makeWrap<DstType>();
 			oxReturnError(convert(ctx, src, wrapCast<DstType>(*dst)));
 			return {std::move(dst)};
diff --git a/src/olympic/keel/src/typeconv.cpp b/src/olympic/keel/src/typeconv.cpp
index 909ac105..c09bf89f 100644
--- a/src/olympic/keel/src/typeconv.cpp
+++ b/src/olympic/keel/src/typeconv.cpp
@@ -2,8 +2,6 @@
  * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include <ox/claw/read.hpp>
-
 #include <keel/media.hpp>
 #include <keel/typeconv.hpp>