Revert "Optimizations mane"

This reverts commit 98858412890fc34b7c0e094c6e3f9d3452b04810.