Uncertainty: Cleaning up more code changes that are not finally used