get rid of hcatalog dependency