Remove unused import
Continue update to 1.7