Simplified the entity "flattening" step to remove unneeded temporary
annotations.Deletd some unused JAPE files