Update default.xml

Clean Up done - should be Eddited Soon!