closing sessions all over the place to prevent starvation

Change-Id: I8349c47e8f5e76a291153019fce277fcc1625010