#324: removed deprecated code