Revert "Dynamic columns"

This reverts commit 2996bd96ec15bd33af08e7e10b5ebb22776a855a.