Remove unused import and some triangles