fixed typo in aliases
cleaned up unused aliases and removed references to z