rev 29 : cleanup