Merge "Clean up slice from spa." into main