Fix bug with some endpoint. Kill echo as unneeded.