Add more ChatSecure cleanups