Update Default.xml and delete unused manifest