[FIX] Remove more static table references #1929
Merge pull request #1954 from barrybingo/development

[FIX] Remove more static table references #1929