ISIS-695: deleting some unused code

also attempt to fix ISIS-544; abandoning for now (low priority)