Reconfigured aliases, removed a few unused items