- Clean up / consoladate various shuffle masks.