Cleanup inheritance