diff --git a/lib/q65_decode.f90 b/lib/q65_decode.f90
index 193ba6afc..6068e3ef3 100644
--- a/lib/q65_decode.f90
+++ b/lib/q65_decode.f90
@@ -89,10 +89,10 @@ contains
     df1=12000.0/nfft1
     this%callback => callback
     nFadingModel=1
+! Set up the codewords for full-AP list decoding    
+    call q65_set_list(mycall,hiscall,hisgrid,codewords,ncw) 
     dgen=0
     call q65_enc(dgen,codewords)         !Initialize the Q65 codec
-! Set up the codewords for full-AP list decoding
-    call q65_set_list(mycall,hiscall,hisgrid,codewords,ncw)
     call timer('sync_q65',0)
     call q65_sync(nutc,iwave,ntrperiod,mode65,codewords,ncw,nsps,      &
          nfqso,ntol,ndepth,lclearave,emedelay,xdt,f0,snr1,width,dat4,  &
diff --git a/lib/qra/q65/q65_set_list.f90 b/lib/qra/q65/q65_set_list.f90
index 266659d60..44b2e12cb 100644
--- a/lib/qra/q65/q65_set_list.f90
+++ b/lib/qra/q65/q65_set_list.f90
@@ -10,7 +10,6 @@ subroutine q65_set_list(mycall,hiscall,hisgrid,codewords,ncw)
   data isync/1,9,12,13,15,22,23,26,27,33,35,38,46,50,55,60,62,66,69,74,76,85/
 
   ncw=0
-  codewords=0
   if(hiscall(1:1).eq. ' ') return
   
   ncw=MAX_NCW
diff --git a/lib/qra/q65/q65_sync.f90 b/lib/qra/q65/q65_sync.f90
index 1ed8fdbe6..616c7ba86 100644
--- a/lib/qra/q65/q65_sync.f90
+++ b/lib/qra/q65/q65_sync.f90
@@ -53,11 +53,6 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps,   &
   nsmo=int(0.7*mode_q65*mode_q65)
   if(nsmo.lt.1) nsmo=1
 
-!### TEMPORARY
-  f0=-99
-  xdt=-99
-!###
-  
   allocate(s1(iz,jz))
   allocate(s3(-64:LL-65,63))
   allocate(c0(0:nfft-1))
@@ -163,13 +158,6 @@ subroutine q65_sync(nutc,iwave,ntrperiod,mode_q65,codewords,ncw,nsps,   &
      endif
   enddo  ! imsg
 
-!### TEMPORARY
-  if(f0.le.0.0 .or. xdt.lt.-90.) then
-     write(71) iz,jz,ia2,ccf_best,ipk,jpk,nfqso,mode_q65,df,xdt,f0,  &
-          imsg_best,ccf,ccf1
-  endif
-!###
-
   i1=i0+ipk-64
   i2=i1+LL-1
   j=j0+jpk-7