Revert "Optimizations Galore"

This reverts commit 4f3eb3b2971365c1b665412dcce2d96c8bc8ab03.