constants cleanup and reshuffle