Spring clean of aliases