BUG: Fixed a couple issues and removed unused variables
BUG: Fixed a couple issues and removed unused variables

Change-Id: I7b451b88caeddf78b76e282924941172b9c77687

mspark93/VTK,keithroe/vtkoptix,sankhesh/VTK,keithroe/vtkoptix,sankhesh/VTK,biddisco/VTK,berendkleinhaneveld/VTK,biddisco/VTK,candy7393/VTK,demarle/VTK,cjh1/VTK,aashish24/VTK-old,candy7393/VTK,spthaolt/VTK,ashray/VTK-EVM,ashray/VTK-EVM,msmolens/VTK,hendradarwin/VTK,berendkleinhaneveld/VTK,keithroe/vtkoptix,SimVascular/VTK,hendradarwin/VTK,msmolens/VTK,hendradarwin/VTK,SimVascular/VTK,spthaolt/VTK,SimVascular/VTK,demarle/VTK,mspark93/VTK,aashish24/VTK-old,candy7393/VTK,gram526/VTK,spthaolt/VTK,demarle/VTK,msmolens/VTK,biddisco/VTK,demarle/VTK,aashish24/VTK-old,biddisco/VTK,ashray/VTK-EVM,sumedhasingla/VTK,hendradarwin/VTK,SimVascular/VTK,candy7393/VTK,aashish24/VTK-old,cjh1/VTK,mspark93/VTK,keithroe/vtkoptix,ashray/VTK-EVM,jmerkow/VTK,berendkleinhaneveld/VTK,ashray/VTK-EVM,biddisco/VTK,gram526/VTK,gram526/VTK,hendradarwin/VTK,msmolens/VTK,biddisco/VTK,jmerkow/VTK,SimVascular/VTK,sumedhasingla/VTK,demarle/VTK,sankhesh/VTK,sumedhasingla/VTK,cjh1/VTK,collects/VTK,collects/VTK,sumedhasingla/VTK,sankhesh/VTK,berendkleinhaneveld/VTK,sumedhasingla/VTK,jmerkow/VTK,gram526/VTK,jmerkow/VTK,candy7393/VTK,johnkit/vtk-dev,johnkit/vtk-dev,spthaolt/VTK,candy7393/VTK,collects/VTK,mspark93/VTK,mspark93/VTK,gram526/VTK,ashray/VTK-EVM,sumedhasingla/VTK,johnkit/vtk-dev,sankhesh/VTK,demarle/VTK,collects/VTK,jmerkow/VTK,jmerkow/VTK,demarle/VTK,mspark93/VTK,candy7393/VTK,collects/VTK,sumedhasingla/VTK,berendkleinhaneveld/VTK,msmolens/VTK,jmerkow/VTK,johnkit/vtk-dev,demarle/VTK,keithroe/vtkoptix,berendkleinhaneveld/VTK,mspark93/VTK,gram526/VTK,keithroe/vtkoptix,aashish24/VTK-old,biddisco/VTK,johnkit/vtk-dev,gram526/VTK,cjh1/VTK,johnkit/vtk-dev,SimVascular/VTK,sankhesh/VTK,candy7393/VTK,collects/VTK,johnkit/vtk-dev,aashish24/VTK-old,ashray/VTK-EVM,spthaolt/VTK,keithroe/vtkoptix,cjh1/VTK,cjh1/VTK,gram526/VTK,berendkleinhaneveld/VTK,hendradarwin/VTK,mspark93/VTK,sumedhasingla/VTK,spthaolt/VTK,spthaolt/VTK,msmolens/VTK,keithroe/vtkoptix,msmolens/VTK,hendradarwin/VTK,ashray/VTK-EVM,sankhesh/VTK,SimVascular/VTK,msmolens/VTK,jmerkow/VTK,SimVascular/VTK,sankhesh/VTK