cleared up deprecated code