cleanup logging for swap claims #4291