Remove last remaning hive api fetches