Merge "Improve cleanup of hosts after booking"