Explicitly remove shuffle id.

Explicitly remove stage