Remove unused options
(cherry picked from commit 886765f)