#96 Remove ULCC specific items from the generic template