Similar cleanups