Removing echo statements