fixed cleanup on signin / signout