Class hierarchy cleanup: