Remove echo statement