Add better clean up. Add ios cleanup.