#147 imports cleanup