Revert "BIG Update - Slow performance fixed"

This reverts commit bb7a980ae545c48859b288a48effc406384ec9da.