What do you think of just deleting this extra code instead of commenting it out?  If we need something back, we can always check the revision history...