Issue #29 – Remove Link