cleanup some more things