core: Cleanup