updated some aliases and removed unused ones