Clean 2305

REF: 2305