Remove old table references from table map. Add optional vrf fallback.

[pudelkoM]

I verified the cleanup, by comparing the compiler output with the version we currently deploy on the demo.