cleanup of inflight manager
split inflight command handler into separate module