Remove legacy (seems unnecessary now).