remove need to call things via API