second batch of using cleanups