XML layout file cleanup