Cleanups missed in prior commit