Updated several files, removed several unused aliases