DAR-1394 | Cleanup in core