Remove dependency from HBCore