KW Cleanup ok !!