Some alias cleanup