remoe deprecated code