removed dep on core api