Clean up is properly done