Add commments
Remove SparkListenerShutdown