cleanup and size changes