remove shuffle_order
remove unused variables