cleanup, align with latest SB snapshot