Revert "Optimalization"

This reverts commit 6a420c6a41d11b47df741c6db3b7f7dd3089f30d.