Fixed deriving of Clone, PartialEq

* Removed because of conflicting impls and the old ones were not
actually working