removed TODO's