[Toolserver-l] Cleanup of user-store