remove unnecessary #include
start level.*, miscellaneous changes to xml