Cleanup core library