Revert "player and optimization update"

This reverts commit c4490e1e85259f381b5db31ea608de9e972dfd32.