finished the de-php-ifying cleanup.