Cleanup of class inheritance