Removed commented-out code, see #72