Removed some fixed TODO:s.