Moved the in-flight control into usage for bulk ops and single ops