rev 38 : Cleanup