Removed commented-out code and an obsolete test for the -r option.