Clean 2311

REF: 2311