[FIX] Remove static table references