Firefalcon cleanup