only 1 remove for both sessions and items

and rename links to avoid cross-wizard-step name conflict