diff --git a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2.cljc b/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2.cljc
index 1ec80a9..71121f7 100644
--- a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2.cljc
+++ b/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2.cljc
@@ -13,14 +13,6 @@
 
 ;=======================
 
-;TODO: There is no as:Class! Why do we need this?
-;Answer jem: I do not want to enhance owl/Class inline from here.
-(s/def
-  ::Class
-  (s/and ::owl/Class))
-
-;=======================
-
 ;http://www.w3.org/ns/activitystreams#object
 (s/def ::Object
   (s/and
diff --git a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2_test.clj b/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2_test.clj
index 10f0dc3..6d98ee3 100644
--- a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2_test.clj
+++ b/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2_test.clj
@@ -25,9 +25,6 @@
                                :summary "A simple note",
                                :content "That is a tree."}])))
 
-(deftest class-test
-  (is (s/valid? ::sut/Class "https://social.bla/alyssa/status/RANDOMHASH")))
-
 (deftest result-test
   (is (s/valid? ::sut/result "https://social.bla/alyssa/result/RANDOMHASH"))
   (is (s/valid? ::sut/result {:type "http://www.types.example/flightstatus", :name "On Time"}))
diff --git a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/owl_test.cljc b/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/owl_test.cljc
index ab12947..4bc968f 100644
--- a/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/owl_test.cljc
+++ b/src/test/cljc/org/domaindrivenarchitecture/activity_pub_poc/owl_test.cljc
@@ -19,3 +19,7 @@
   (is (sut/owl-class? []))
   (is (not (sut/owl-class? "str")))
   (is (not (sut/owl-class? nil))))
+
+(deftest class-test
+  (is (s/valid? ::sut/Class "https://social.bla/alyssa/status/RANDOMHASH"))
+  (is (s/valid? ::sut/Class {})))