cleaned up session stuff