Have removed the line output code for now. Will do a separate PR later as you suggest.