cleanup, add to-do