clean up default.xml

Change-Id: I9db87db0538c78b4011078a3355ddbe927a1c8c7