fix import regressions; remove debug code