removed TODO notes