Issue #43: Remove dead code, add comments