Removing subclassing