Remove unused code (has already bean comment out) again
Remove unused code (has already bean comment out) again

  - previous commit was not pushed because of conflict

satoyos/Shuffle100,satoyos/Shuffle100