Further cleaning of columns. Sigh.