Remove vestages of the old encoding system