remover some deprecated code