close flow rework

Change-Id: I46a9ddc1782bead9586dc4c1c719a657e8010a2e
Signed-off-by: Eyal Salomon <esalomon@mellanox.com>