Revert "More OPTIMIZATIONS"

This reverts commit 1330bf7095122409b8e7a33f34c38738d9b12122.