Got rid of orphan org.xml