column removal, cleanup of class names