Minor clean-up of imports