Remove unused code
Add superclasses into the metric