Refactoring from Remote to Local sessions