Remove obsolete settings

Change-Id: I583f0eb09f0deade803eac0ad9b57fe0ae413464