Clean up inheritance check