Remove imports no longer used