TBD-1086 && TBD-1087: Review Spark components and remove legacy parameters and labels.