Trivial, update todos and cleanup.