Actually only need an inflight count, also some cleanup
Actually only need an inflight count, also some cleanup

alexfrolov/grappa,buaasun/grappa,buaasun/grappa,uwsampa/grappa,buaasun/grappa,alexfrolov/grappa,alexfrolov/grappa,uwsampa/grappa,alexfrolov/grappa,uwsampa/grappa,buaasun/grappa,uwsampa/grappa,buaasun/grappa,buaasun/grappa,alexfrolov/grappa,buaasun/grappa,alexfrolov/grappa,alexfrolov/grappa,uwsampa/grappa,uwsampa/grappa,uwsampa/grappa