Revert "Optimizations 1"

This reverts commit 050618cf5af77ddbde518c0413ca50243977ed8d.