Removing classes and most inheritance