removed a couple TODO's