Merge "Removed redundant call to session.removeSelf()"