Clean 2302

REF: 2302