added remove before flight tag