more cleanup... ;-)