Clean 2331

REF: 2331