Alias cleanup 2.