remove model calls - still more - import broken still