Remove Duplicated Saver Mode Feature

Revert af3f44bd0710ac0e009f771818c1f00877cd1839