More TODOs are done

Only one left (for now)