Removed extraneous TODO items.