removed TODO's and comments