more size cleanups