Hold off on refactoring SQL tables.
Things seem to be working!