Finished to-do clean-up