Revert "Optimizations"

This reverts commit 11103f4bed00783502ef5d847e035bc38e6cb8fc.