removed deprecated code/tests