various cleanup but mostly one import per line