Replaced cleanup code with session manager cleanup
Hide or make ambiguous the key's value