[FIX] Remove static table references
Merge pull request #2085 from barrybingo/development

[FIX] Remove static table references