General merge+cleanup