Minor cleanup; removing commented-out code