Clean up and only using default.xml

Change-Id: I401852922defd01e0136189f66fd283dbed229e1