DAR-810|811: Clean up