Remove unwanted overlay values

Change-Id: I2fe42a5fc17a0f7b700c791c6b138c69ee649726