Clean 2315

REF: 2315