Cleanup
Better airline and bundle fixes