diff --git a/src/main/clj/org/domaindrivenarchitecture/activity_pub_poc/xsd.clj b/src/main/clj/org/domaindrivenarchitecture/activity_pub_poc/xsd.clj
deleted file mode 100644
index abbad0e..0000000
--- a/src/main/clj/org/domaindrivenarchitecture/activity_pub_poc/xsd.clj
+++ /dev/null
@@ -1,7 +0,0 @@
-(ns org.domaindrivenarchitecture.activity-pub-poc.xsd
-  (:require [clojure.spec.alpha :as s]))
-
-; http://www.datypic.com/sc/xsd/t-xsd_anyURI.html
-; TODO: Find out correct definition!
-(defn anyUri? [input]
-  false)
\ No newline at end of file
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 4d85c19..29ff3a8 100644
--- a/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2.cljc
+++ b/src/main/cljc/org/domaindrivenarchitecture/activity_pub_poc/activitystreams2.cljc
@@ -65,8 +65,9 @@
 ;Answer jem: I do not want to enhance owl/Class inline from here.
 (s/def
   ::Class
-  (s/merge ::owl/Class
-           (s/keys :opt-un [::id ::object])))
+  (s/and ::owl/Class
+         ))
+         ;(s/keys :opt-un [::id ::object])))
 
 
 ;http://www.w3.org/ns/activitystreams#Like