removed some TODO's