Better session expire handle and remove unused argument