Fix in SessionHandler

Use receiver and sender classes. Removed useless import, variables and code