cleanup core api