s4-common: remove unused overlay options

Change-Id: I618d374a4fb9417637b90b4e25a292adbec11748