Fix Bootstrap issue
Clean up booking-factory