reorg to reduce memory usage to help mmic tests