merge, small cleanup