cleand up some import