removed todos that no longer were relevant.