cleaning up deconfig for the blaze

Change-Id: I4745359b350f15f4098a309a4073b5d09c1ee353