refs ITC-105 and ITC-106: removed old code that was replaced with more generic/elegant code