Bump versions
Remove stale TODO