danw
committed
on 20 Mar 01
more cleanup