EZP-22146: removed deprecated column and join