clean out columns, etc
misc regenerated changes