take out files moved to spark_common_util