I think we need to remove those lines, not comment them out...