No point in saving/restoring flying and op state, also get rid of some not needed events