Clean 2327

REF: 2327