cleanup some mess