US to remove Cuba's terrorism designation in prisoner release deal