removed review issue, see #32
removed dead code, see #32
addressed review issue, see #32
addressed review issue, see #32