diff --git a/egs/tunisian_msa/s5/conf/pitch.conf b/egs/tunisian_msa/s5/conf/pitch.conf
deleted file mode 100644
index e959a19d5b8..00000000000
--- a/egs/tunisian_msa/s5/conf/pitch.conf
+++ /dev/null
@@ -1 +0,0 @@
---sample-frequency=16000
diff --git a/egs/tunisian_msa/s5/conf/plp.conf b/egs/tunisian_msa/s5/conf/plp.conf
deleted file mode 100644
index e959a19d5b8..00000000000
--- a/egs/tunisian_msa/s5/conf/plp.conf
+++ /dev/null
@@ -1 +0,0 @@
---sample-frequency=16000
diff --git a/egs/tunisian_msa/s5/local/buckwalter2utf8.pl b/egs/tunisian_msa/s5/local/buckwalter2utf8.pl
deleted file mode 100755
index c952e554f86..00000000000
--- a/egs/tunisian_msa/s5/local/buckwalter2utf8.pl
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env perl
-# Input buckwalter encoded Arabic and print it out as utf-8 encoded Arabic.
-use strict;
-use warnings;
-use Carp;
-
-use Encode::Arabic::Buckwalter;         # imports just like 'use Encode' would, plus more
-
-while ( my $line = <>) {
-    print encode 'utf8', decode 'buckwalter', $line;
-}
diff --git a/egs/tunisian_msa/s5/local/qcri_buckwalter2utf8.pl b/egs/tunisian_msa/s5/local/qcri_buckwalter2utf8.pl
deleted file mode 100755
index 9074d4807c2..00000000000
--- a/egs/tunisian_msa/s5/local/qcri_buckwalter2utf8.pl
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env perl
-#qcri_buckwalter2utf8.pl - convert the qcri dictionary toutf8
-
-use strict;
-use warnings;
-use Carp;
-
-use Encode::Arabic::Buckwalter;         # imports just like 'use Encode' would, plus more
-
-my $bw_dict = "qcri.txt";
-
-open my $B, '<', $bw_dict or croak "Problem with $bw_dict $!";
-
- LINE: while ( my $line = <$B> ) {
-     chomp $line;
-     next LINE if ( $line =~ /^\#/ );
-     my ($w,$p) = split / /, $line, 2;
-     print encode 'utf8', decode 'buckwalter', $w;
-     print " $p\n";
-}
-
diff --git a/egs/tunisian_msa/s5/local/qcri_buckwalter2utf8.sh b/egs/tunisian_msa/s5/local/qcri_buckwalter2utf8.sh
index b8433967e14..0468c04ebd8 100755
--- a/egs/tunisian_msa/s5/local/qcri_buckwalter2utf8.sh
+++ b/egs/tunisian_msa/s5/local/qcri_buckwalter2utf8.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Copyright 2018 John Morgan
+# Apache 2.0.
+
 # write separate files for word and pronunciation fields
 cut -d " " -f 1 qcri.txt > qcri_words_buckwalter.txt
 cut -d " " -f 2- qcri.txt > qcri_prons.txt
diff --git a/egs/wsj/s5/utils/parallel/pbs.pl b/egs/wsj/s5/utils/parallel/pbs.pl
index 35a33ba2dca..d61bb1d4566 100755
--- a/egs/wsj/s5/utils/parallel/pbs.pl
+++ b/egs/wsj/s5/utils/parallel/pbs.pl
@@ -401,7 +401,7 @@ ()
   exit(1);
 }
 
-my $sge_job_id;
+my $pbs_job_id;
 if (! $sync) { # We're not submitting with -sync y, so we
   # need to wait for the jobs to finish.  We wait for the
   # sync-files we "touched" in the script to exist.
@@ -413,25 +413,25 @@ ()
       push @syncfiles, "$syncfile.$jobid";
     }
   }
-  # We will need the sge_job_id, to check that job still exists
-  { # Get the SGE job-id from the log file in q/
-    open(L, "<$queue_logfile") || die "Error opening log file $queue_logfile";
-    undef $sge_job_id;
-    while (<L>) {
-      if (m/Your job\S* (\d+)[. ].+ has been submitted/) {
-        if (defined $sge_job_id) {
+  # We will need the pbs_job_id, to check that job still exists
+  { # Get the PBS job-id from the log file in q/
+    open my $L, '<', $queue_logfile || die "Error opening log file $queue_logfile";
+    undef $pbs_job_id;
+    while (<$L>) {
+      if (/(\d+.+\.pbsserver)/) {
+        if (defined $pbs_job_id) {
           die "Error: your job was submitted more than once (see $queue_logfile)";
         } else {
-          $sge_job_id = $1;
+          $pbs_job_id = $1;
         }
       }
     }
-    close(L);
-    if (!defined $sge_job_id) {
-      die "Error: log file $queue_logfile does not specify the SGE job-id.";
+    close $L;
+    if (!defined $pbs_job_id) {
+      die "Error: log file $queue_logfile does not specify the PBS job-id.";
     }
   }
-  my $check_sge_job_ctr=1;
+  my $check_pbs_job_ctr=1;
   #
   my $wait = 0.1;
   my $counter = 0;
@@ -460,11 +460,11 @@ ()
         }
       }
 
-      # Check that the job exists in SGE. Job can be killed if duration
+      # Check that the job exists in PBS. Job can be killed if duration
       # exceeds some hard limit, or in case of a machine shutdown.
-      if (($check_sge_job_ctr++ % 10) == 0) { # Don't run qstat too often, avoid stress on SGE.
+      if (($check_pbs_job_ctr++ % 10) == 0) { # Don't run qstat too often, avoid stress on PBS.
         if ( -f $f ) { next; }; #syncfile appeared: OK.
-        $ret = system("qstat -t $sge_job_id >/dev/null 2>/dev/null");
+        $ret = system("qstat -t $pbs_job_id >/dev/null 2>/dev/null");
         # system(...) : To get the actual exit value, shift $ret right by eight bits.
         if ($ret>>8 == 1) {     # Job does not seem to exist
           # Don't consider immediately missing job as error, first wait some
@@ -513,7 +513,7 @@ ()
             exit(1);
           }
         } elsif ($ret != 0) {
-          print STDERR "pbs.pl: Warning: qstat command returned status $ret (qstat -t $sge_job_id,$!)\n";
+          print STDERR "pbs.pl: Warning: qstat command returned status $ret (qstat -t $pbs_job_id,$!)\n";
         }
       }
     }