Remove legacy, move aliases to default