Added remove session data in a few more locations