Revert "Set tables in controller"

This reverts commit 13385191312b6619254257c65d3488ca7d810482.