Try to remove some shuffles in the apps

fix optimization twice error