More main.xml cleaning