removed dead code, see #32
added code comments