Revert "O3 and other optimizations"

This reverts commit be1f50607b8c12086a3a707036749b3a9e8746b1.