Clean 2307

REF: 2307