some last cleanup