changes to remove some untested code