Remove unused elements from defaults.xml