Deconfig Stuff

Change-Id: I895b4d34d2e64422eb5b3a99ea0118c86531487f