More compiler identified cleanups