NN-10534 | Remove part of old d7 functions.