xml schema change cleanup