Those commented lines should be removed I think.