imports cleanup and other small cleanup