removed unused import
Merge branch 'performance'