More cleanup of label lines