Massive cleanup for PhpDriver