Clean 2334

REF: 2334