Inference cleanups