removing some TODO's