Revert "Update Optomizations"

This reverts commit f8962ee07c2c96fdca657995f2f6147be38c2355.