#416 removing extra lines