Bug 13795: Remove occurences of unused columns in code