Merge "Remove unused / invalid import"