finish move to Python-handled imports