Revert "Optimizations"

This reverts commit ac4b0260a7197d6312d6b19a26edb674b9b25ed1.

Revert for now

Signed-off-by: Jean Francis Dominique S. Mabalot <jfdsmabalot@redhat.com>