Revert "Frameworks: Optimize more and fixes"

I have no idea why. But users say to revert it.

This reverts commit 0b710a1f82375f0f051c3113434dfb648a34d7dd.