Remove advanced settings

Change-Id: Ib9ab08be0e03223c79c405144f0abeed6374e320