Removing files for Carl; fix for PHP-612