Cleaning up todos