Remove echo statements