gustafn
committed
on 25 May 07
some more cleanup after restructuring