Remove aliases, move to aliases file