default.xml cleaned up