Removing more reference checking