removed some old/deprecated code