Removed step grouping