clean up default.xml

Change-Id: I8a6da840ecefb78cbd389f0f14f22a3c735d1d6b