Cleanup in core.