wip: remove deprecated code