Removed coreapi calls (whoops!)