Clean up column stats code