Undid unnecessary inheritance resolution business