Improved removeBySession method

Change-Id: I689835759a1465ad072aa7ea96b6f0146854f60d