diff --git a/Source/divg.f90 b/Source/divg.f90
index 8f1f575bda1..ca3e1d22dd5 100644
--- a/Source/divg.f90
+++ b/Source/divg.f90
@@ -1405,7 +1405,7 @@ END SUBROUTINE PREDICT_NORMAL_VELOCITY
 
 SUBROUTINE EVACUATION_PRESSURE_ZONES
 REAL(EB) :: X1,Y1,X2,Y2,Z1,Z2
-INTEGER :: IW,N,II,JJ,KK,IIG,JJG,KKG,ITMP,I,J,K,I_VENT,N_OVERLAP
+INTEGER :: ITMP,I,J,K,I_VENT,N_OVERLAP
 
 IF (.NOT.DO_EVACUATION) RETURN
 
diff --git a/Source/func.f90 b/Source/func.f90
index 56e45d9548a..226bed4213d 100644
--- a/Source/func.f90
+++ b/Source/func.f90
@@ -1007,7 +1007,7 @@ END SUBROUTINE ALLOCATE_BOUNDARY_COORD_ARRAYS
 
 SUBROUTINE ALLOCATE_BOUNDARY_ONE_D_ARRAYS
 
-USE GLOBAL_CONSTANTS, ONLY: THERMALLY_THICK,TMPM,SIGMA,TMPA4,RSUM0,TMPA,RHOA,N_TRACKED_SPECIES
+USE GLOBAL_CONSTANTS, ONLY: THERMALLY_THICK,TMPM,SIGMA,TMPA4,RHOA,N_TRACKED_SPECIES
 TYPE(BOUNDARY_ONE_D_TYPE), POINTER :: ONE_D
 REAL(EB) :: X_POS
 INTEGER :: NN,N
@@ -1164,7 +1164,6 @@ SUBROUTINE ALLOCATE_BOUNDARY_PROPS_ARRAYS
 
 USE GLOBAL_CONSTANTS, ONLY: TMPA
 TYPE(BOUNDARY_PROPS_TYPE), POINTER :: BP
-INTEGER :: NN
 
 IF (BP_INDEX==0) THEN
    NAS = M%NEXT_AVAILABLE_BOUNDARY_PROPS_SLOT
@@ -1249,11 +1248,11 @@ SUBROUTINE ALLOCATE_BOUNDARY_RADIA_ARRAYS
 
 IF (.NOT.ALLOCATED(BR%BAND)) ALLOCATE(BR%BAND(NUMBER_SPECTRAL_BANDS))
 DO NN=1,NUMBER_SPECTRAL_BANDS
-   IF (.NOT.ALLOCATED(BR%BAND(NN)%ILW)) ALLOCATE(BR%BAND(NN)%ILW(NUMBER_RADIATION_ANGLES)) 
+   IF (.NOT.ALLOCATED(BR%BAND(NN)%ILW)) ALLOCATE(BR%BAND(NN)%ILW(NUMBER_RADIATION_ANGLES))
    BR%BAND(NN)%ILW = 0._EB
 ENDDO
 
-IF (.NOT.ALLOCATED(BR%IL)) ALLOCATE(BR%IL(BOUNDARY_RADIA_REALS_ARRAY_SIZE(2))) 
+IF (.NOT.ALLOCATED(BR%IL)) ALLOCATE(BR%IL(BOUNDARY_RADIA_REALS_ARRAY_SIZE(2)))
 BR%IL = SIGMA*TMPA4/PI
 
 END SUBROUTINE ALLOCATE_BOUNDARY_RADIA_ARRAYS
@@ -1299,7 +1298,7 @@ SUBROUTINE PACK_PARTICLE(NM,LP_INDEX,LPC_INDEX,STORAGE_INDEX,UNPACK_IT,NOM)
 IC = 0
 
 IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),LP%TAG,UNPACK_IT)
-IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),LP%CLASS_INDEX,UNPACK_IT)  
+IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),LP%CLASS_INDEX,UNPACK_IT)
 IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),LP%ORIENTATION_INDEX,UNPACK_IT)
 IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),LP%WALL_INDEX,UNPACK_IT) ; IF (PRESENT(NOM) .AND. UNPACK_IT) LP%WALL_INDEX = 0
 IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),LP%DUCT_INDEX,UNPACK_IT)
@@ -1497,7 +1496,7 @@ SUBROUTINE PACK_BOUNDARY_COORD(NM,IC,RC,OS,STORAGE_INDEX,BC_INDEX,UNPACK_IT)
 
 BC => MESHES(NM)%BOUNDARY_COORD(BC_INDEX)
 
-IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),BC%II,UNPACK_IT) 
+IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),BC%II,UNPACK_IT)
 IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),BC%JJ,UNPACK_IT)
 IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),BC%KK,UNPACK_IT)
 IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),BC%IIG,UNPACK_IT)
@@ -1541,9 +1540,9 @@ SUBROUTINE PACK_BOUNDARY_ONE_D(NM,IC,RC,LC,OS,SF,STORAGE_INDEX,OD_INDEX,UNPACK_I
 IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),ONE_D%PRESSURE_ZONE,UNPACK_IT)
 IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),ONE_D%NODE_INDEX,UNPACK_IT)
 IC=IC+1 ; CALL EQUATE(OS%INTEGERS(IC,STORAGE_INDEX),ONE_D%N_SUBSTEPS,UNPACK_IT)
-   
+
 I2 = IC
-   
+
 I1 = I2+1 ; I2 = I1 + SF%ONE_D_INTEGERS_ARRAY_SIZE(1) - 1
 CALL EQUATE(OS%INTEGERS(I1:I2,STORAGE_INDEX) , ONE_D%N_LAYER_CELLS(1:I2-I1+1) , UNPACK_IT)
 
@@ -1616,7 +1615,7 @@ SUBROUTINE PACK_BOUNDARY_ONE_D(NM,IC,RC,LC,OS,SF,STORAGE_INDEX,OD_INDEX,UNPACK_I
 
 I1 = I2+1 ; I2 = I1 + SF%ONE_D_REALS_ARRAY_SIZE(11) - 1
 CALL EQUATE(OS%REALS(I1:I2,STORAGE_INDEX) , ONE_D%K_S(0:I2-I1) , UNPACK_IT)
-   
+
 I1 = I2+1 ; I2 = I1 + SF%ONE_D_REALS_ARRAY_SIZE(12) - 1
 CALL EQUATE(OS%REALS(I1:I2,STORAGE_INDEX) , ONE_D%AWM_AEROSOL(1:I2-I1+1) , UNPACK_IT)