cleaning out a couple @todo that had already been taken care of.

cleaning out a couple @todo that had already been taken care of.