clean-up final