Mostly is as good as not at all though. Yes, you should stop using class hierarchies. Composition is the path to salvation.