Little cleanup for subclass system