alias cleanup
more alias cleanup