Revert "More optimizations"

This reverts commit 6c0a0632ce15ef879a2653f984e23279d5a4183a.

Broke build, will add optimizations selectively
derp

Signed-off-by: frap129 <frap129@gmail.com>