LUN-1413: Cleanup.