New tokens removed, using aliases instead (#328)