Sagan Unified2 cleanup