Removed echo statements