removed echo debug statements