FIX: logout problems issue 82210042
cleanup