Removed old TODO markers.

  Since they have been done.

  Updates #101.