Continue to remove type-oriented language