some cleanup, import is really really slow