removed unneeded TODO tags