Removed disabled ("commented out") code.