Clean 2312

REF: 2312