more removal of excessive StructureException #54