fix import cb getting called twice & some cleanup