Cleanup settings keys

Change-Id: I2280a846de8267db59cb251ef53f233ec9f8232e