Revert "Make optimizations"

This reverts commit 9534a18b3c5ca36424f63a04790da12a571dd947.