cleanup a bunch of imports