removed unneeded comment and resolved two TODO issues