[FIX] Remove more static table references #1929