Better removal of lines/highlight lines