PIM-2183: Remove hardcoded tables