Clean up a few TODO's.