Minor cleanup of spark-overlay
Additional cleanups
Merge pull request #2172 from ussuri/cleanup-spark-overlay

Minor cleanup of spark-overlay