Remove shuffle/taketoken

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7601