Rm old TODO
Prefer exported AVal paths