Remove Echo statement