Revert "Generate Table Improvments"

This reverts commit 1d55c1d97e828aaeb3f47e6c3bd4f6ba95a8288a.