Some cleanup and changes to deal with difference between new and old ontonotes formats