Remove references to DescribeObjectType