clean up imports so that things compile