Removed a few TODO items.