Fix for logout not cleaning up DB