more cleanup, shuffling