Issue #22 removed some obselete comments...