[real-world uses] Remove link again
Add the addModeClass option

Issue #2107