fix version, remove cloned class, update references