Revert "Test Optimizations, horribly kanged"

This reverts commit ca05e67a89607b127178868662a3dbeb9762ff9b.
Optimizations that aren't stupid