CDK-423. Remove HCatalog dependency.