Removing unneded variable
Improvements for SLURM support