gustafn
committed
on 25 Feb 07
some more cleanup