Remove no longer used imports