Clear out TODO cruft