fix import and cleanup