Some cleaning up of imports