cleanup before merging in msuperd1