Clean 2303

REF: 2303