Get rid of spill map in SparkEnv