Fixed Session cleanup