GATEWAY-3344:Cleanup items that help but do not resolve issue.