Made dangle-remover global