Remove redundant settings from overlay

Change-Id: I661a534550a3b698b63fc7e38450abfeec969f76