Rework active/destroy session