Clean up some columns for #72