2012, 2013 cleanups of extra column headers