discarded some deprecated code