continued replacement of remaining types