Remove debug code
Add all columns to NG annotation tables