clean import mess, fix #10