Cleanup use import lines