Remove unused and duplicate import statements

Clean up import order.