delete comments, add data.xml schema