Clean 2332

REF: 2332