Remove last remnant of the Old Way