remove unused aliases and fix others