*Really* cleanup the sample config this time

Change-Id: I7f3a9b48e40b8b33acad308b68eced64ed210cce