rev 48 : CLeanup