[NUCRDBMS-754] Drop deprecated code