[DL] php-only version deleted
[EH] a lot of minor stuff