Cleanup booking code
Cleanup booking code