removed TODO's in code