cleanup some more