Removed unused aliases and fixed some broken ones.