Kill Advanced settings (temp)

Change-Id: I19d899caf28a64be6c2e8fbcb0a159029f3cd211