removed dead code
closes #15
closes #16