Clean 2324

REF: 2324