Apply namespacing to Booking class
Remove dead code in booking class