find some more inline imports and move them out