Cleanup inheritance pattern