Fix removing ambiguos shortcuts