some extra clean-up