More cleanup of jadepunk.dtd